]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'libata/NEXT'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 24 Oct 2011 21:38:31 +0000 (08:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 24 Oct 2011 21:38:31 +0000 (08:38 +1100)
commit2c6a9224085ee1211f8647e81fb0bc7cab6f3252
tree283224cc4f4e02aac014e23a781fa17c40e8758a
parent4780146adbefaf4cad44a26b71a8678489bf920a
parenta0da19149f589e3e6fd5bab527b3326368ab92bc
Merge remote-tracking branch 'libata/NEXT'

Conflicts:
drivers/ata/pata_at91.c
drivers/ata/pata_at91.c