summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-29 00:14:20 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-29 00:14:20 -0700
commit4fd830f9c5fff95aef470db1513913a2efff5e4d (patch)
tree7d98497b93334f0f6ffc956da88c71d31910f720 /kernel
parentb5d748ca0a00a7cf495d9a255625480dce9f267f (diff)
parenta45f698c0d8c7aaad5b5624a8b9900c9e3c28efc (diff)
Merge bk://bart.bkbits.net/ide-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions