tree 09b5633ee5432d2c8f1d56b8d7abb7a2f41337d0
parent 03a4491f5d6835028dbbcf36990599c5c9f6ff55
parent dff0092bcdb7b21ba2e862fed7c92e79dfb26806
author Linus Torvalds <torvalds@linux-foundation.org> 1294945375 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294945375 -0800

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