From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Jan 2011 19:02:55 +0000 (-0800)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.38-rc1~228
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=581548db3b3c0f6e25b500329eb02e3c72e7acbe;p=karo-tx-linux.git

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] Fix format warning in arch/ia64/kernel/acpi.c
---

581548db3b3c0f6e25b500329eb02e3c72e7acbe