Merge branch 'features/ahci' into for-arnd-features
authorSascha Hauer <s.hauer@pengutronix.de>
Fri, 14 Oct 2011 07:37:27 +0000 (09:37 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Fri, 14 Oct 2011 07:37:27 +0000 (09:37 +0200)

Trivial merge