summaryrefslogtreecommitdiffstats
path: root/drivers/net/ibm_newemac/zmii.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-14 06:23:57 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-14 06:23:57 +0200
commit92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (patch)
tree8c0f10ff685126b084cd86da49d07d0b09f62782 /drivers/net/ibm_newemac/zmii.h
parentMerge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux... (diff)
parent[IA64] Add latest crop of syscalls (diff)
downloadlinux-92fa5bd9a946b6e7aab6764e7312e4e3d9bed295.tar.xz
linux-92fa5bd9a946b6e7aab6764e7312e4e3d9bed295.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Add latest crop of syscalls [IA64] Fix 64-bit atomic routines to return "long"
Diffstat (limited to 'drivers/net/ibm_newemac/zmii.h')
0 files changed, 0 insertions, 0 deletions