diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 09:11:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 09:11:31 -0700 |
commit | 58d4ea65b98f154f3326b038eecda32f90b46ea8 (patch) | |
tree | 636aed413349dece12c08a4bd3d1fea0254976d8 /lib/inflate.c | |
parent | 26f0cf91813bdc8e61595f8ad6660251e2ee9cf6 (diff) | |
parent | fbe0f8348fd6c3d016a3f48756eb729b41a67c22 (diff) |
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 'lib/inflate.c')
0 files changed, 0 insertions, 0 deletions