diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-25 16:29:02 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-25 16:29:02 +1000 |
| commit | d9540af89669443b16225ff87c566e9fb4d01a27 (patch) | |
| tree | 09789525c3e61c723d3459a5b35832c15944b229 /Documentation/power/devices.txt | |
| parent | 4766118e28b59940e52f68147d7dfa757e06d124 (diff) | |
| parent | dbacdac140def273a3e0721cff4fe501ad1cc88b (diff) | |
Merge commit 'kmemleak/kmemleak'
Conflicts:
arch/x86/kernel/vmlinux_32.lds.S
arch/x86/kernel/vmlinux_64.lds.S
lib/Kconfig.debug
mm/slob.c
Diffstat (limited to 'Documentation/power/devices.txt')
0 files changed, 0 insertions, 0 deletions