aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-30 07:51:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-30 07:51:29 -0700
commita8a44921383039bd5387020d035123d21660b309 (patch)
tree762260c85b584f48c74d70f0e1fe03c930c2898e /drivers/net/s2io.c
parentMerge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentBlackfin: bitops: fix include order after little endian inclusion (diff)
downloadlinux-dev-a8a44921383039bd5387020d035123d21660b309.tar.xz
linux-dev-a8a44921383039bd5387020d035123d21660b309.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: Blackfin: bitops: fix include order after little endian inclusion Blackfin: defconfigs: update after misc devices defaulted to N Blackfin: use more standard pr_fmt in the module loader
Diffstat (limited to 'drivers/net/s2io.c')
0 files changed, 0 insertions, 0 deletions