From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Aug 2008 17:43:55 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.27-rc5~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ef708ea449e5eab2780020ec79485db80937833;p=thirdparty%2Fkernel%2Flinux.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 __{in,out}s{w,l} to handle unaligned data
  [IA64] Fix ia64 build failure when CONFIG_SFC=m
---

1ef708ea449e5eab2780020ec79485db80937833