tree 7b152866f3ee7cd71adb22697fe2a798e824b19d
parent b689e83961e6b2e39bf378c1468fd7d7a924656c
parent 37c23e7fda6913d133ac12012395e58af1fe24c6
author Linus Torvalds <torvalds@linux-foundation.org> 1219106601 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1219106601 -0700

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] use generic compat_old_sys_readdir
  [IA64] pci_acpi_scan_root cleanup
  [IA64] Shrink shadow_flush_counts to a short array to save 8k of per_cpu area.
  [IA64] Remove sn2_defconfig.