diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-02 20:58:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-02 20:58:33 -0700 |
| commit | 164a2c58227bcd509db95920e849e914e9512204 (patch) | |
| tree | ebaf941fd442d8a681dc83991e325a9ee443672b /arch/arm/mach-at91/at91sam9g45_reset.S | |
| parent | 981d901095a6f40577c16156006ac4f4c167f85e (diff) | |
| parent | a988fb806d72d4e3a0edbeaece3f2f1172ce44b8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"Couple of small bug fixes:
1) strlcpy in ldom_reboot() is still not quite right, use sprintf
instead from Kees Cook.
2) Generic hugetlb interface pte checks should use the widest return
type, otherwise high bits can get chopped off.
3) Fix build with PCI MSI enabled on 32-bit sparc"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: fix MSI build failure on Sparc32
sparc: remove deprecated IRQF_DISABLED
mm: Fix generic hugetlb pte check return type.
sparc: fix ldom_reboot buffer overflow harder
Diffstat (limited to 'arch/arm/mach-at91/at91sam9g45_reset.S')
0 files changed, 0 insertions, 0 deletions