diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-23 11:41:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-23 11:41:44 -0700 |
| commit | 35a177a08d14f238d89d7f03918d3e0482af3240 (patch) | |
| tree | 72a71fe4cec13e079e182633a62ea9219dbde656 /include/linux/pm.h | |
| parent | Merge git://git.infradead.org/users/cbou/battery-3.1 (diff) | |
| parent | xfs: fix tracing builds inside the source tree (diff) | |
| download | wireguard-linux-35a177a08d14f238d89d7f03918d3e0482af3240.tar.xz wireguard-linux-35a177a08d14f238d89d7f03918d3e0482af3240.zip | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: fix tracing builds inside the source tree
xfs: remove subdirectories
xfs: don't expect xfs headers to be in subdirectories
Diffstat (limited to 'include/linux/pm.h')
0 files changed, 0 insertions, 0 deletions