summaryrefslogtreecommitdiffstats
path: root/drivers/parport/ieee1284.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-18 01:42:14 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-18 01:42:14 +0100
commit61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb (patch)
tree2c6b7a4357ba85f7be027bd492da9bf8d7c6acb2 /drivers/parport/ieee1284.c
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff)
parent[CPUFREQ] pcc-cpufreq: remove duplicate statements (diff)
downloadlinux-61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb.tar.xz
linux-61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb.zip
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] pcc-cpufreq: remove duplicate statements [CPUFREQ] Remove the pm_message_t argument from driver suspend [CPUFREQ] Remove unneeded locks [CPUFREQ] Remove old, deprecated per cpu ondemand/conservative sysfs files [CPUFREQ] Remove deprecated sysfs file sampling_rate_max [CPUFREQ] powernow-k8: The table index is not worth displaying [CPUFREQ] calculate delay after dbs_check_cpu [CPUFREQ] Add documentation for sampling_down_factor [CPUFREQ] drivers/cpufreq: Remove unnecessary semicolons
Diffstat (limited to 'drivers/parport/ieee1284.c')
0 files changed, 0 insertions, 0 deletions