summaryrefslogtreecommitdiffstats
path: root/drivers/net/sungem_phy.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-16 07:40:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-16 07:40:48 -0700
commit3307f19f634dfb134b370c59a778fdb2d574c17b (patch)
treebe7d1431af7741295e729ce25d376294cc7dead3 /drivers/net/sungem_phy.c
parent5b1d07ed0e5b2707f786957c7a40eb2f399c84a8 (diff)
parented247e12fe5da4417602c3c0ce22932fb0f9cac1 (diff)
downloadblackbird-op-linux-3307f19f634dfb134b370c59a778fdb2d574c17b.tar.gz
blackbird-op-linux-3307f19f634dfb134b370c59a778fdb2d574c17b.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: sparc: remove some pointless conditionals before kfree() sbus: changed ioctls to unlocked sparc: asm/atomic.h on 32bit should include asm/system.h for xchg sparc64: Fix smp_callin() locking.
Diffstat (limited to 'drivers/net/sungem_phy.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud