diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 10:53:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 10:53:11 -0400 |
commit | 0e2ffbf650bf97499c02327719383818777651e6 (patch) | |
tree | 70cc80a7270ac6ee9e338e4c87a1f06c2432e79b /mm/slab.c | |
parent | 1b0f06d0b4860a8a73dc0b48540d82d8897ead71 (diff) | |
parent | a83f982313bc60dd3d87e50f8c88d6a169e8a5a0 (diff) |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 of HEAD
* HEAD:
[SPARC]: Fix OF register translations under sub-PCI busses.
[SPARC64]: Refine Sabre wsync logic.
[SERIAL] sunsu: Handle keyboard and mouse ports directly.
[SPARC64]: Fix 2 bugs in sabre_irq_build()
[SPARC64]: Update defconfig.
[SPARC64]: Fix make headers_install
[SPARC64]: of_device_register() error checking fix
Diffstat (limited to 'mm/slab.c')
0 files changed, 0 insertions, 0 deletions