summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-05-05 13:33:06 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-05-05 13:33:06 +0200
commit845f765b6e7f5830b14c7910203d271c43e6af6a (patch)
treee37b3c0d8d77c3218c280d8f38405d9a66e6bbd3 /include/linux
parent9bb76883c19f360693d54b12b67a9b0d17dc83a8 (diff)
parentacb427e2d0b9250859729420e93e4b77dfd43593 (diff)
downloadbarebox-845f765b6e7f5830b14c7910203d271c43e6af6a.tar.gz
barebox-845f765b6e7f5830b14c7910203d271c43e6af6a.tar.xz
Merge branch 'for-next/regulator'
Conflicts: commands/Makefile
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions