Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Jan 2011 21:06:44 +0000 (13:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Jan 2011 21:06:44 +0000 (13:06 -0800)
commit9cefa17e196beab300d4faf09d242de77e5900d5
treec7f8e6677e0370466fdc8fca1a7bc87a7902151b
parent891cc2283216bf76f387546f0e220caf8ce9fbf9
parent6ce1f81f51c7b22f539012e446c01e8c75d20fd9
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] fix ia64 build failure in pmdp_get_and_clear