]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes' into for-next
authorOlof Johansson <olof@lixom.net>
Tue, 27 May 2014 18:12:52 +0000 (11:12 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 27 May 2014 18:12:52 +0000 (11:12 -0700)
* fixes:
  MAINTAINERS: Add reset controller framework entry

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge