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

author	James Morris <jmorris@namei.org>
	Mon, 13 Jul 2009 14:30:40 +0000 (00:30 +1000)
committer	James Morris <jmorris@namei.org>
	Mon, 13 Jul 2009 14:30:40 +0000 (00:30 +1000)
commit	7d45ecafb6792ca68da9517969d37d910601845f
tree	a98b1074e5577e66a97963745f975404d0aac266	tree \| snapshot
parent	be940d6279c30a2d7c4e8d1d5435f957f594d66d	commit \| diff
parent	7638d5322bd89d49e013a03fe2afaeb6d214fabd	commit \| diff

Merge branch 'master' into next

Conflicts:
include/linux/personality.h

Use Linus' version.

Signed-off-by: James Morris <jmorris@namei.org>