1
linux/arch/powerpc/configs
David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net
Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c
2011-09-22 03:23:13 -04:00
..
40x net: fix IBM EMAC driver after rename. 2011-08-18 21:33:49 -07:00
44x net: fix IBM EMAC driver after rename. 2011-08-18 21:33:49 -07:00
52xx rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
83xx powerpc/fsl: enable verbose bug output 2011-05-19 01:14:30 -05:00
85xx powerpc/85xx: enable caam crypto driver by default 2011-08-30 21:27:30 -05:00
86xx powerpc/86xx: enable the framebuffer console on the MPC8610 HPCD 2011-06-27 08:36:18 -05:00
adder875_defconfig
amigaone_defconfig
c2k_defconfig powerpc: Fix build warning of the defconfigs 2011-04-27 14:18:41 +10:00
cell_defconfig
celleb_defconfig
chrp32_defconfig
corenet32_smp_defconfig powerpc/85xx: enable caam crypto driver by default 2011-08-30 21:27:30 -05:00
corenet64_smp_defconfig powerpc/85xx: enable caam crypto driver by default 2011-08-30 21:27:30 -05:00
ep88xc_defconfig
ep8248e_defconfig
g5_defconfig
gamecube_defconfig
holly_defconfig
iseries_defconfig
linkstation_defconfig powerpc: Restore some misc devices to our configs 2011-03-30 10:36:23 +11:00
maple_defconfig
mgcoge_defconfig
mpc83xx_defconfig
mpc85xx_defconfig powerpc/85xx: enable the audio drivers in the defconfigs 2011-08-30 21:27:29 -05:00
mpc85xx_smp_defconfig powerpc/85xx: enable the audio drivers in the defconfigs 2011-08-30 21:27:29 -05:00
mpc86xx_defconfig powerpc/fsl: enable verbose bug output 2011-05-19 01:14:30 -05:00
mpc512x_defconfig powerpc: Restore some misc devices to our configs 2011-03-30 10:36:23 +11:00
mpc866_ads_defconfig
mpc885_ads_defconfig
mpc5200_defconfig powerpc: Restore some misc devices to our configs 2011-03-30 10:36:23 +11:00
mpc7448_hpc2_defconfig
mpc8272_ads_defconfig
pasemi_defconfig powerpc: Restore some misc devices to our configs 2011-03-30 10:36:23 +11:00
pmac32_defconfig powerpc: Fix build warning of the defconfigs 2011-04-27 14:18:41 +10:00
ppc6xx_defconfig cgroup: remove the ns_cgroup 2011-05-26 17:12:34 -07:00
ppc40x_defconfig net: fix IBM EMAC driver after rename. 2011-08-18 21:33:49 -07:00
ppc44x_defconfig net: fix IBM EMAC driver after rename. 2011-08-18 21:33:49 -07:00
ppc64_defconfig powerpc: Enable lockup and hung task detectors in pseries and ppc64 defeconfigs 2011-07-19 15:13:06 +10:00
ppc64e_defconfig
pq2fads_defconfig
prpmc2800_defconfig
ps3_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
pseries_defconfig powerpc: Enable lockup and hung task detectors in pseries and ppc64 defeconfigs 2011-07-19 15:13:06 +10:00
storcenter_defconfig
tqm8xx_defconfig
wii_defconfig