summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-12 16:41:37 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-12 16:41:37 -0800
commit238523e1a15874b88955ff9c8f63e35597ae2857 (patch)
tree3a794b119a40a7dd5bd73b513297c4580a090303 /arch/ia64/kernel
parent1ff8038988adecfde71d82c0597727fc239d4e8c (diff)
parent016cc85072944bfa03c5e4b587ae89588ce2e5df (diff)
downloadblackbird-op-linux-238523e1a15874b88955ff9c8f63e35597ae2857.tar.gz
blackbird-op-linux-238523e1a15874b88955ff9c8f63e35597ae2857.zip
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'arch/ia64/kernel')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud