tree abf5f3fca27aba1c517e9fe02c9381aee4775720
parent 5770a3fb5f8544d40ae03b010318345cdd05d662
parent 8a549f8b581db95fec1e2d86ff857594fcfcd9db
author Linus Torvalds <torvalds@linux-foundation.org> 1219772635 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1219772635 -0700

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