summaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/nic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-17 03:36:47 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-17 03:36:47 +0200
commit477de0de446210eb5c87e2a54c9ba4c8844fb98b (patch)
tree399098973886cd595d33b375cefd022b9461c88c /drivers/net/sfc/nic.c
parentmm: fix kernel-doc warning in page_alloc.c (diff)
parentRevert "mmc: fix a race between card-detect rescan and clock-gate work instan... (diff)
downloadlinux-477de0de446210eb5c87e2a54c9ba4c8844fb98b.tar.xz
linux-477de0de446210eb5c87e2a54c9ba4c8844fb98b.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: Revert "mmc: fix a race between card-detect rescan and clock-gate work instances"
Diffstat (limited to 'drivers/net/sfc/nic.c')
0 files changed, 0 insertions, 0 deletions