aboutsummaryrefslogtreecommitdiffstats
path: root/fs/buffer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-02 23:01:57 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-02 23:01:57 -0500
commitf7d222ea2ac7aebf1ac06a76e7739ed17480fd38 (patch)
treea6de80eed5413b32cf41bcb73d108a8f11253c8e /fs/buffer.c
parent7a16d387dda10ecc0c4fbf086b89bfb1eb84d9c2 (diff)
parenta74ea43df1afc68f265c0ac2cb64031d855ae97b (diff)
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6: of/promtree: allow DT device matching by fixing 'name' brokenness (v5) x86: OLPC: have prom_early_alloc BUG rather than return NULL of/flattree: Drop an uninteresting message to pr_debug level of: Add missing of_address.h to xilinx ehci driver
Diffstat (limited to 'fs/buffer.c')
0 files changed, 0 insertions, 0 deletions