aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph/snap.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-19 18:08:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-19 18:08:06 -0700
commit08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86 (patch)
tree0d087f009b80bdf54f22fdb78437af790c1afc27 /fs/ceph/snap.c
parent13588209aa90d9c8e502750fc86160314555612f (diff)
parent5d94e81f69d4b1d1102d3ab557ce0a817c11fbbb (diff)
downloadkernel_samsung_espresso10-08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86.zip
kernel_samsung_espresso10-08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86.tar.gz
kernel_samsung_espresso10-08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86.tar.bz2
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Introduce pci_map_biosrom() x86, olpc: Use device tree for platform identification
Diffstat (limited to 'fs/ceph/snap.c')
0 files changed, 0 insertions, 0 deletions