summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-02 20:49:38 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-02 20:49:38 -1000
commit73a9fe86fa21ccd528807b8cc871dc18be67ee5a (patch)
tree07b8295e89e8cacf29f74b23782a4f662259cad2 /drivers/media
parentf3406816bb2486fc44558bec77179cd9bcbd4450 (diff)
parent50658b6602dad6dc76c226917f5d8cec0f680eab (diff)
Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6
* 'spi/next' of git://git.secretlab.ca/git/linux-2.6: spi/pl022: remove function cannot exit
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions