summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-29 23:41:00 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-29 23:41:00 +0200
commitc45140a996b511bccdcbbdbea7e36f001826bdf2 (patch)
tree8d6613880399d1a25598f7cb51834efbbda87ad9 /drivers/net
parentext3: fix broken handling of EXT3_STATE_NEW (diff)
parentsparc64: Properly truncate pt_regs framepointer in perf callback. (diff)
downloadlinux-c45140a996b511bccdcbbdbea7e36f001826bdf2.tar.xz
linux-c45140a996b511bccdcbbdbea7e36f001826bdf2.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Properly truncate pt_regs framepointer in perf callback. arch/sparc/kernel: Use set_cpus_allowed_ptr sparc: Fix use of uid16_t and gid16_t in asm/stat.h
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions