From: Linus Torvalds Date: Tue, 26 Feb 2008 15:55:29 +0000 (-0800) Subject: Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7704a8b6fc4a8f51599eb2af4dcf1e2ac9c7e576;p=linux-beck.git 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. --- 7704a8b6fc4a8f51599eb2af4dcf1e2ac9c7e576