From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Nov 2011 23:52:17 +0000 (-0700)
Subject: Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f7e801172c53c4dc48b1f888a72eae069be6333a;p=deliverable%2Flinux.git

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()
---

f7e801172c53c4dc48b1f888a72eae069be6333a