]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'h8300-remove/h8300-remove'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:32:38 +0000 (14:32 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:32:38 +0000 (14:32 +0200)
commitc846c9f4924436366aec16e3e63a72c606685c41
tree87a7c6205a06a04784f0672b43a4a886ba47b30a
parent2eaea13b4b586ea832d08cefb3f44f2824426fe2
parente9783b06e69a13233d98dbc3e008c5612a6f844d
Merge remote-tracking branch 'h8300-remove/h8300-remove'

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