]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.15-fixes' into for-next
authorTejun Heo <tj@kernel.org>
Thu, 8 May 2014 15:00:18 +0000 (11:00 -0400)
committerTejun Heo <tj@kernel.org>
Thu, 8 May 2014 15:00:18 +0000 (11:00 -0400)
1  2 
drivers/ata/Kconfig

Simple merge