From: David S. Miller <davem@davemloft.net>
Date: Mon, 24 Jan 2011 22:09:35 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.39-rc1~468^2~484
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bdc22a56549e7983c6b443298672641952ea035;p=pandora-kernel.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	net/sched/sch_hfsc.c
	net/sched/sch_htb.c
	net/sched/sch_tbf.c
---

5bdc22a56549e7983c6b443298672641952ea035
Reading git-diff-tree failed