summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-13 10:00:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-13 10:00:15 -0800
commit0143832cc96d0bf78486297aad5c8fb2c2ead02a (patch)
tree4aa5c06a58da4295a6053fb950e883fb33db82ae /block
parentf8b372a11cc102b9a0dcc6ac2bd10f0b6b2755a9 (diff)
parent106665d937df6eff33c71997a52f7bc3aefa6c12 (diff)
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: drivers/pcmcia/soc_common.c: Use printf extension %pV pcmcia: fix warning in synclink driver pcmcia/sa1100: don't put machine specific init functions in .init.text pcmcia/cm4000: fix error code pd6729: Coding Style fixes
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions