Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7e80117 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 092f4c56 6b1c70b1

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -3205,8 +3205,7 @@ IA64 (Itanium) PLATFORM 
M:	Tony Luck <tony.luck@intel.com>

M:	Fenghua Yu <fenghua.yu@intel.com>

L:	linux-ia64@vger.kernel.org

W:	http://www.ia64-linux.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git

S:	Maintained

F:	arch/ia64/

arch/ia64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ config HAVE_SETUP_PER_CPU_AREA 
	def_bool y



config GENERIC_GPIO

	def_bool y

	bool



config DMI

	bool

arch/ia64/configs/generic_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ CONFIG_NET_ETHERNET=y 
CONFIG_NET_TULIP=y

CONFIG_TULIP=m

CONFIG_NET_PCI=y

CONFIG_NET_VENDOR_INTEL=y

CONFIG_E100=m

CONFIG_E1000=y

CONFIG_IGB=y

arch/ia64/configs/gensparse_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ CONFIG_NET_ETHERNET=y 
CONFIG_NET_TULIP=y

CONFIG_TULIP=m

CONFIG_NET_PCI=y

CONFIG_NET_VENDOR_INTEL=y

CONFIG_E100=m

CONFIG_E1000=y

CONFIG_TIGON3=y

arch/ia64/configs/tiger_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ CONFIG_NET_ETHERNET=y 
CONFIG_NET_TULIP=y

CONFIG_TULIP=m

CONFIG_NET_PCI=y

CONFIG_NET_VENDOR_INTEL=y

CONFIG_E100=m

CONFIG_E1000=y

CONFIG_TIGON3=y