diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-03-17 20:46:58 +0100 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-03-17 20:48:06 +0100 |
commit | 2dd22997679a88874c131f6e6ffb963e6d43b3a6 (patch) | |
tree | bfe1707dda7e755b8b550c6796e2649813bcfbb9 /include/drm/drm_os_linux.h | |
parent | gpio/cs5535-gpio: Fix section mismatch (diff) | |
parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epi... (diff) | |
download | linux-2dd22997679a88874c131f6e6ffb963e6d43b3a6.tar.xz linux-2dd22997679a88874c131f6e6ffb963e6d43b3a6.zip |
Merge remote-tracking branch 'origin' into spi/next
Pull in Linus' tree to pick up changes required for the langwell gpio fixes
Diffstat (limited to 'include/drm/drm_os_linux.h')
0 files changed, 0 insertions, 0 deletions