summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-18 12:23:07 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-18 12:23:07 -0800
commite67b23c71cb9ee02d65a74c3858716ba2dedd554 (patch)
tree17cfeadd37b93ca758aa3ffb61e02edf62289aea /arch/ia64
parentd4bf205305a9188894ac4e2e9875e42f9f8eabfd (diff)
parentf7492f17f2123f0f4db5f9e8ba89867a7b352658 (diff)
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'arch/ia64')
0 files changed, 0 insertions, 0 deletions