From: David S. Miller <davem@davemloft.net>
Date: Thu, 7 Oct 2010 02:11:17 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.36-rc8~17^2~4
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=12e94471b2be5ef9b55b10004a3a2cd819490036

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
---

12e94471b2be5ef9b55b10004a3a2cd819490036