diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 18:11:31 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 18:11:31 +0200 |
commit | 58d4ea65b98f154f3326b038eecda32f90b46ea8 (patch) | |
tree | 636aed413349dece12c08a4bd3d1fea0254976d8 /drivers/char/pcmcia/cm4000_cs.c | |
parent | Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux... (diff) | |
parent | mmc_spi: Fix unterminated of_match_table (diff) | |
download | linux-58d4ea65b98f154f3326b038eecda32f90b46ea8.tar.xz linux-58d4ea65b98f154f3326b038eecda32f90b46ea8.zip |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
Diffstat (limited to 'drivers/char/pcmcia/cm4000_cs.c')
0 files changed, 0 insertions, 0 deletions