diff options
| author | Takashi Iwai | 2012-07-19 08:21:40 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2012-07-19 08:21:57 +0200 |
| commit | 1558eb838ff502faafacf26b6a711dbaae796009 (patch) | |
| tree | 8049ea20a214033369725ed58b8b4a3ca4110887 /crypto/proc.c | |
| parent | Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... (diff) | |
| parent | ALSA: Move some headers to local directories from include/sound (diff) | |
| download | kernel-qcow2-linux-1558eb838ff502faafacf26b6a711dbaae796009.tar.gz kernel-qcow2-linux-1558eb838ff502faafacf26b6a711dbaae796009.tar.xz kernel-qcow2-linux-1558eb838ff502faafacf26b6a711dbaae796009.zip | |
Merge branch 'topic/pm-convert' into for-next
This merges the changes for converting to new PM ops for platform
and some other drivers.
Also move some header files to local places from the public
include/sound.
Diffstat (limited to 'crypto/proc.c')
0 files changed, 0 insertions, 0 deletions