git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 29a6ccc 7b21fdd)

author	Linus Torvalds <torvalds@linux-foundation.org>
	Sat, 28 May 2011 17:51:01 +0000 (10:51 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Sat, 28 May 2011 17:51:01 +0000 (10:51 -0700)
commit	571503e10045c89af951962ea0bb783482663aad
tree	b24af1e4b5c67e2da940991b8219f8f8c4e7ac0a	tree \| snapshot
parent	29a6ccca3869bbe33879dae0cd7df2a1559eff54	commit \| diff
parent	7b21fddd087678a70ad64afc0f632e0f1071b092	commit \| diff

Merge branch 'setns'

* setns:
ns: Wire up the setns system call

Done as a merge to make it easier to fix up conflicts in arm due to
addition of sendmmsg system call

arch/arm/include/asm/unistd.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/calls.S	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree