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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 08162e6 69964ea)

author	James Morris <james.l.morris@oracle.com>
	Fri, 4 May 2012 02:46:40 +0000 (12:46 +1000)
committer	James Morris <james.l.morris@oracle.com>
	Fri, 4 May 2012 02:46:40 +0000 (12:46 +1000)
commit	898bfc1d46bd76f8ea2a0fbd239dd2073efe2aa3
tree	e6e666085abe674dbf6292555961fe0a0f2e2d2f	tree \| snapshot
parent	08162e6a23d476544adfe1164afe9ea8b34ab859	commit \| diff
parent	69964ea4c7b68c9399f7977aa5b9aa6539a6a98a	commit \| diff

Merge tag 'v3.4-rc5' into next

Linux 3.4-rc5

Merge to pull in prerequisite change for Smack:
86812bb0de1a3758dc6c7aa01a763158a7c0638a

Requested by Casey.

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
include/asm-generic/siginfo.h	diff1 \|	diff2 \|	blob \| history
security/commoncap.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree