projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f058925 72d3105)
Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Mon, 22 Sep 2008 00:41:56 +0000 (17:41 -0700)
committerJames Morris <jmorris@namei.org>
Mon, 22 Sep 2008 00:41:56 +0000 (17:41 -0700)
Conflicts:

MAINTAINERS

Thanks for breaking my tree :-)

Signed-off-by: James Morris <jmorris@namei.org>
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
security/selinux/ss/services.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc security/selinux/ss/services.c
Simple merge
John Crispins staging tree