diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 21:27:34 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 21:27:34 (GMT) |
| commit | f23a5e1405e47df6cdc86568ea75df266b9e151f (patch) | |
| tree | 788fab831a235ce8f143e8562d832336a595cff7 /fs/ncpfs/ncp_fs_sb.h | |
| parent | d24c2af42292cb4ad9c829d71fe0d795112ca6e7 (diff) | |
| parent | 0775a60aca2375ea5598741b30d13fe6d3f15617 (diff) | |
| download | linux-fsl-qoriq-f23a5e1405e47df6cdc86568ea75df266b9e151f.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: Fix PM QOS's user mode interface to work with ASCII input
PM / Hibernate: Update kerneldoc comments in hibernate.c
PM / Hibernate: Remove arch_prepare_suspend()
PM / Hibernate: Update some comments in core hibernate code
Diffstat (limited to 'fs/ncpfs/ncp_fs_sb.h')
0 files changed, 0 insertions, 0 deletions