Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Aug 2008 17:43:55 +0000 (10:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Aug 2008 17:43:55 +0000 (10:43 -0700)
* '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


Trivial merge