summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-08 13:57:19 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-08 13:57:19 -0800
commitd86527ddcab4684d1a051b5f35f023b4374b1271 (patch)
tree681cc85e16defea8f3c4f8d011f08f79898138a8 /fs
parent0446e9d46347344dd2d794927f22eb81e1d1c296 (diff)
parenta651d80c7136029de3c044308fd63d88348915ff (diff)
downloadop-kernel-dev-d86527ddcab4684d1a051b5f35f023b4374b1271.zip
op-kernel-dev-d86527ddcab4684d1a051b5f35f023b4374b1271.tar.gz
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__
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud