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

author	Greg Kroah-Hartman <gregkh@suse.de>
	Tue, 19 Apr 2011 13:37:49 +0000 (06:37 -0700)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Tue, 19 Apr 2011 13:38:06 +0000 (06:38 -0700)
commit	03068ff131c0a565e2cb26303a0df63467136723
tree	23fd6cc7d3f21bda56f24d44f6de51fdfbe8dbb9	tree \| snapshot
parent	32235b07b52e948900613e27c5cbd955d084ae8a	commit \| diff
parent	f0e615c3cb72b42191b558c130409335812621d8	commit \| diff

Staging: merge 2.6.39-rc4 into staging-next

This handles the removal of the samsung-laptop driver and other
minor merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>