diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 23:52:17 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 23:52:17 (GMT) |
| commit | f7e801172c53c4dc48b1f888a72eae069be6333a (patch) | |
| tree | 61d5243a48fe3640dbace0222054fc88dd0c6612 /arch/ia64/uv | |
| parent | 092f4c56c1927e4b61a41ee8055005f1cb437009 (diff) | |
| parent | 6b1c70b1ff6f800f081a6bbef662789135f7b398 (diff) | |
| download | linux-fsl-qoriq-f7e801172c53c4dc48b1f888a72eae069be6333a.tar.xz | |
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()
Diffstat (limited to 'arch/ia64/uv')
0 files changed, 0 insertions, 0 deletions