]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'h8300-remove/h8300-remove'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:20:05 +0000 (11:20 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:20:05 +0000 (11:20 +0200)
commita6fa9cbdd410b84a84b9e6fd975d0b3aae09b206
tree8b36634caf32ae52bb7775cddf0b7b807119e638
parent012be170a50c83fbc42c00ca536d14668b7cda6a
parente9783b06e69a13233d98dbc3e008c5612a6f844d
Merge remote-tracking branch 'h8300-remove/h8300-remove'

Conflicts:
drivers/parport/Kconfig
MAINTAINERS
drivers/parport/Kconfig