aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-09 14:22:35 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-09 14:22:35 -0800
commita967e127d0233f2472af64597de3f3920872310c (patch)
treeebcdf53cfad97bb2a2168657585443eeed11e0ea /kernel
parentbb9b813bb665cdbe7019a4f1e93f7138e7bf59d0 (diff)
parentf194bda4ce7e71cc95535f494a4a5515cd91ed85 (diff)
Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] 85xx: Enable CONFIG_SERIAL_8250_SHARE_IRQ [POWERPC] Select u-image as default image for Linkstation [POWERPC] 83xx: Minor fixes for 834x_mds USB setup code [POWERPC] Fix warning in powermac pci.c [POWERPC] Fix warning in powermac feature.c [POWERPC] Fix warning in prom_parse.c of_irq_map_oldworld() [POWERPC] Celleb: bug fix caused by not casting pointer types [POWERPC] Add missing newline in xmon help output [POWERPC] No DEEPNAP on 970MP 1.0
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions