Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Nov 2011 23:52:17 +0000 (16:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Nov 2011 23:52:17 +0000 (16:52 -0700)
commitf7e801172c53c4dc48b1f888a72eae069be6333a
tree61d5243a48fe3640dbace0222054fc88dd0c6612
parent092f4c56c1927e4b61a41ee8055005f1cb437009
parent6b1c70b1ff6f800f081a6bbef662789135f7b398
Merge branch 'misc-3.2' of git://git./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()
MAINTAINERS
arch/ia64/Kconfig
arch/ia64/configs/generic_defconfig