Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jan 2010 21:57:19 +0000 (13:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jan 2010 21:57:19 +0000 (13:57 -0800)
commitd86527ddcab4684d1a051b5f35f023b4374b1271
tree681cc85e16defea8f3c4f8d011f08f79898138a8
parent0446e9d46347344dd2d794927f22eb81e1d1c296
parenta651d80c7136029de3c044308fd63d88348915ff
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] move fnptr definition inside #ifdef __KERNEL__