diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 07:33:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 07:33:17 -0700 |
| commit | a06cb1ae3cb64367c0fdc313c43ebb0558e51827 (patch) | |
| tree | 71a0143ae1196d088db354a8620c2efb23f0a062 /arch/cris/include/asm/pci.h | |
| parent | Merge tag 'stable/for-linus-3.7-x86-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen (diff) | |
| parent | sparc: fix format string argument for prom_printf() (diff) | |
| download | linux-dev-a06cb1ae3cb64367c0fdc313c43ebb0558e51827.tar.xz linux-dev-a06cb1ae3cb64367c0fdc313c43ebb0558e51827.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"Some quick fixes after today's merge-window pull"
1) Add missing dependency on Sparc DES driver, oops. From Dave Jones.
2) Tell GCC that prom_printf() is printf-like and fix the few
resultiing warnings. From Akinobu Mita.
3) Niagara-2 memcpy doesn't provide it's return value correctly in some
circumstances.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: fix format string argument for prom_printf()
crypto: Build SPARC DES algorithms on SPARC only.
sparc64: Fix return value of Niagara-2 memcpy.
Diffstat (limited to 'arch/cris/include/asm/pci.h')
0 files changed, 0 insertions, 0 deletions