]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb5dc5d242f0de1cf3ba56cce4369b0ec2389c364
tree681cc85e16defea8f3c4f8d011f08f79898138a8
parent8d139f575fcef1063ae92a3e3950be642682802a
parente23c566af05f9a376bbe059ca86c2648500f38d0
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] move fnptr definition inside #ifdef __KERNEL__