diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 16:40:14 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 16:40:14 +0200 |
| commit | 60d808ddff97071ee4c3e1d13454642f3d0e8ae1 (patch) | |
| tree | db1fbf6694ae4419f264a8919653f8540c80c44d /block/blk-cgroup.c | |
| parent | Merge branch 'picoxcell-next' of git://github.com/jamieiles/linux-2.6-ji into... (diff) | |
| parent | Merge tag 'omap-pm-v3.11/cleanup/pm' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| download | linux-60d808ddff97071ee4c3e1d13454642f3d0e8ae1.tar.xz linux-60d808ddff97071ee4c3e1d13454642f3d0e8ae1.zip | |
Merge tag 'omap-for-v3.11/pm-serial-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren:
Serial driver platform init code clean-up via Kevin Hilman <khilman@linaro.org>:
OMAP: PM: the serial core + driver can no handle no_console_suspend support
without any SoC specific handlding or SoC-specific DT bindings. Remove
the now unused SoC specifics for OMAP.
* tag 'omap-for-v3.11/pm-serial-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
arm: omap2+: omap_device: remove no_idle_on_suspend
arm: dts: am33xx: Remove "ti,no_idle_on_suspend" property.
arm: omap2+: serial: remove no_console_suspend support
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'block/blk-cgroup.c')
0 files changed, 0 insertions, 0 deletions