aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wan/sbni.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 15:19:27 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 15:19:27 -0700
commite779220ec3d70843cef5e9f410d7a0c287f46718 (patch)
tree3caa1e9bf74f5eae372ea7c636903ab09d80d9d3 /drivers/net/wan/sbni.c
parentb8c638acacfe32c0bde361916467af00691f1965 (diff)
parent62715ec832c7229b677415901e98799124efb023 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Kill bogus set_fs(KERNEL_DS) in do_rt_sigreturn(). [SPARC64]: Update defconfig. [SPARC64]: Kill explicit %gl register reference.
Diffstat (limited to 'drivers/net/wan/sbni.c')
0 files changed, 0 insertions, 0 deletions