]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.11' into for-next
authorTejun Heo <tj@kernel.org>
Tue, 18 Jun 2013 18:36:07 +0000 (11:36 -0700)
committerTejun Heo <tj@kernel.org>
Tue, 18 Jun 2013 18:36:07 +0000 (11:36 -0700)
1  2 
drivers/ata/libata-scsi.c

Simple merge