summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-29 07:29:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-29 07:29:40 -0700
commit249842477c589ea29ff161ace9c8666d96e9883a (patch)
tree5b041a3a703fe9c5040835b27c4a727009a242db /drivers
parent18c0635363364ca2fc2d1cbd65bbf918daf89d1a (diff)
parent81397a625d063403d80a25bba00fa1cb6d7e04f5 (diff)
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6: ARM: mark empty gpio.h files empty gpio: Fix ARM versatile-express build failure of: include errno.h
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions