diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 08:39:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 08:39:59 -0700 |
| commit | bf5cb66447e7d9f7f111c1d0ebb6d7c90ec24b4d (patch) | |
| tree | 59d1cde4e83afd8768e866b8d4ed0c9d9b5ae29b /fs/ecryptfs | |
| parent | 4efb686205d5065f4e488e20fc858446b8ad7bb7 (diff) | |
| parent | 77a9a768b7374cd23d1f400097eede9f1547f508 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: disable apm on the olpc
Diffstat (limited to 'fs/ecryptfs')
0 files changed, 0 insertions, 0 deletions