Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jan 2011 19:02:55 +0000 (11:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jan 2011 19:02:55 +0000 (11:02 -0800)
commit581548db3b3c0f6e25b500329eb02e3c72e7acbe
tree09b5633ee5432d2c8f1d56b8d7abb7a2f41337d0
parent03a4491f5d6835028dbbcf36990599c5c9f6ff55
parentdff0092bcdb7b21ba2e862fed7c92e79dfb26806
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 format warning in arch/ia64/kernel/acpi.c