Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
* 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: MAINTAINERS: Update entry for IA64 [IA64] gpio: GENERIC_GPIO default must be n [IA64[ add CONFIG_NET_VENDOR_INTEL=y to default config files where needed [IA64] agp/hp-agp: Allow binding user memory to the AGP GART [IA64] sn2: add missing put_cpu()
Showing
- MAINTAINERS 1 addition, 2 deletionsMAINTAINERS
- arch/ia64/Kconfig 1 addition, 1 deletionarch/ia64/Kconfig
- arch/ia64/configs/generic_defconfig 1 addition, 0 deletionsarch/ia64/configs/generic_defconfig
- arch/ia64/configs/gensparse_defconfig 1 addition, 0 deletionsarch/ia64/configs/gensparse_defconfig
- arch/ia64/configs/tiger_defconfig 1 addition, 0 deletionsarch/ia64/configs/tiger_defconfig
- arch/ia64/configs/xen_domu_defconfig 1 addition, 0 deletionsarch/ia64/configs/xen_domu_defconfig
- arch/ia64/configs/zx1_defconfig 1 addition, 0 deletionsarch/ia64/configs/zx1_defconfig
- arch/ia64/sn/kernel/sn2/sn_hwperf.c 8 additions, 4 deletionsarch/ia64/sn/kernel/sn2/sn_hwperf.c
- drivers/char/agp/hp-agp.c 4 additions, 2 deletionsdrivers/char/agp/hp-agp.c
Loading
Please register or sign in to comment