tree e0218f75d9ab5911a2339b6c9f7e4e21aaeaae1d
parent 42e7b09e688bf86c032ca36ddb65cc548bb6147f
parent d3758f87f39c5b072dde74c55bfb988262a3a45c
author Linus Torvalds <torvalds@linux-foundation.org> 1222190518 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1222190518 -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] kexec fails on systems with blocks of uncached memory
  [IA64] Ski simulator doesn't need check_sal_cache_flush