aboutsummaryrefslogtreecommitdiff
path: root/drivers/ata
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-26 07:55:29 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-26 07:55:29 -0800
commit7704a8b6fc4a8f51599eb2af4dcf1e2ac9c7e576 (patch)
tree4efbf0854234f89c6f4413077ec795fc669b5b0a /drivers/ata
parentadefe11c5383face09068176af7dd4e3a80d8f6b (diff)
parentef8ece55d9b6825c28a5c1a4bd89b94040cb7b32 (diff)
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: [XFS] Undo bit ops cleanup mod due to regression on 32-bit powermac [XFS] Undo bit ops cleanup mod due to regression on 32-bit powermac Remove empty file fs/xfs/Makefile-linux-2.6.
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions