aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 17:26:52 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 17:26:52 -0700
commit4fe8a0f4c5d64cbc78227a88df4566c0d0ee4648 (patch)
tree9dc3fc8276d987058cd8f3826113c5baa2a1b595 /scripts
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq (diff)
parent[IA64] Manual merge fix for 3 files (diff)
downloadlinux-4fe8a0f4c5d64cbc78227a88df4566c0d0ee4648.tar.gz
linux-4fe8a0f4c5d64cbc78227a88df4566c0d0ee4648.zip
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions