summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds2009-11-11 20:33:08 +0100
committerLinus Torvalds2009-11-11 20:33:08 +0100
commite5d45abe1487aa856e48d6d9b857bd200b63b896 (patch)
treece35d4a059a580949036dbb28b58401afad64cf9 /drivers
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentpowerpc: pasemi_defconfig update (diff)
downloadkernel-qcow2-linux-e5d45abe1487aa856e48d6d9b857bd200b63b896.tar.gz
kernel-qcow2-linux-e5d45abe1487aa856e48d6d9b857bd200b63b896.tar.xz
kernel-qcow2-linux-e5d45abe1487aa856e48d6d9b857bd200b63b896.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: pasemi_defconfig update powerpc: 2.6.32 update of defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx powerpc/8xxx: enable IPsec ESP by default on mpc83xx/mpc85xx powerpc/83xx: Fix u-boot partion size for MPC8377E-WLAN boards powerpc/85xx: Fix USB GPIOs for MPC8569E-MDS boards powerpc/82xx: kmalloc failure ignored in ep8248e_mdio_probe() powerpc/85xx: sbc8548 - fixup of PCI-e related DTS fields
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions