aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorChris Zankel <czankel@speedy.(none)>2010-08-03 00:38:00 -0700
committerChris Zankel <czankel@speedy.(none)>2010-08-03 00:38:00 -0700
commit66630f71e23a3b5fe778d38aea2f0c6d017602bf (patch)
tree4aa52e15d68ce870fc8e7dbc140eeb16cd99ef79 /kernel
parentLinux 2.6.35 (diff)
parentxtensa: Disable PCI and nfsroot on simulation target (diff)
downloadlinux-dev-66630f71e23a3b5fe778d38aea2f0c6d017602bf.tar.xz
linux-dev-66630f71e23a3b5fe778d38aea2f0c6d017602bf.zip
Merge remote branch 'origin/master'
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions