summaryrefslogtreecommitdiffstats
path: root/fs/hfs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-07-27 13:56:57 -0700
committerOlof Johansson <olof@lixom.net>2012-07-27 13:56:57 -0700
commit5c62202968d4aaf3bd50e19c421d66aec2e508e0 (patch)
tree925d3102051db9664772911f29a59155825c671d /fs/hfs
parent28a33cbc24e4256c143dce96c7d93bf423229f92 (diff)
parentb93d70aeb8f3b5ed2d74643f5009239a55634e1d (diff)
downloadlinux-5c62202968d4aaf3bd50e19c421d66aec2e508e0.tar.bz2
Merge branch 'for_3.6/pm/coupled-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into late2/pm
* 'for_3.6/pm/coupled-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm: ARM: OMAP4: CPUidle: Open broadcast clock-event device. ARM: OMAP4: CPUidle: add synchronization for coupled idle states ARM: OMAP4: CPUidle: Use coupled cpuidle states to implement SMP cpuidle. ARM: OMAP: timer: allow gp timer clock-event to be used on both cpus
Diffstat (limited to 'fs/hfs')
0 files changed, 0 insertions, 0 deletions