projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cb583f 9ef96da)
Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus
authorAlex Elder <aelder@sgi.com>
Wed, 16 Sep 2009 02:37:47 +0000 (21:37 -0500)
committerAlex Elder <aelder@sgi.com>
Wed, 16 Sep 2009 02:37:47 +0000 (21:37 -0500)
Conflicts:
fs/xfs/linux-2.6/xfs_lrw.c

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
fs/xfs/linux-2.6/xfs_iops.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc fs/xfs/linux-2.6/xfs_iops.c
Simple merge
John Crispins staging tree