summaryrefslogtreecommitdiffstats
path: root/drivers/nubus
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-23 07:40:53 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-23 07:40:53 -0700
commitbfab08c097df5f6a60dd07f0f8c78c54e725780b (patch)
treea93536a2bbcb2331e47d72dd182bb4c4d27b6d8b /drivers/nubus
parenteb0e0076878a4f9e8e6e7e524ded0d6f7d4a6130 (diff)
parent438282d85de2c8f8c5183fdf55140e51a0b18670 (diff)
downloadtalos-obmc-linux-bfab08c097df5f6a60dd07f0f8c78c54e725780b.tar.gz
talos-obmc-linux-bfab08c097df5f6a60dd07f0f8c78c54e725780b.zip
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
Diffstat (limited to 'drivers/nubus')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud