summaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-16 18:36:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-16 18:36:47 -0700
commit477de0de446210eb5c87e2a54c9ba4c8844fb98b (patch)
tree399098973886cd595d33b375cefd022b9461c88c /net/core/dev.c
parentb5e6ab589d570ac79cc939517fab05c87a23c262 (diff)
parent86f315bbb2374f1f077500ad131dd9b71856e697 (diff)
downloadblackbird-op-linux-477de0de446210eb5c87e2a54c9ba4c8844fb98b.tar.gz
blackbird-op-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 'net/core/dev.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud