]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 092f4c5 6b1c70b)
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)
* '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()

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/ia64/Kconfig patch | diff1 | diff2 | blob | history
arch/ia64/configs/generic_defconfig patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc arch/ia64/Kconfig
Simple merge
diff --cc arch/ia64/configs/generic_defconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.