]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.11' into for-next
authorTejun Heo <tj@kernel.org>
Fri, 24 May 2013 01:53:59 +0000 (10:53 +0900)
committerTejun Heo <tj@kernel.org>
Fri, 24 May 2013 01:53:59 +0000 (10:53 +0900)
1  2 
drivers/ata/sata_rcar.c

Simple merge