diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-18 03:19:25 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-18 03:19:25 +0100 |
| commit | 82a0a1cc8f94bc59e5919715bc03fc8353fa770d (patch) | |
| tree | c25f19a0ae1f7cb75319b585c1d473cfed463f22 /drivers/power/olpc_battery.c | |
| parent | powerpc/mm: Rework I$/D$ coherency (v3) (diff) | |
| parent | Add support for VT6415 PCIE PATA IDE Host Controller (diff) | |
| download | linux-82a0a1cc8f94bc59e5919715bc03fc8353fa770d.tar.xz linux-82a0a1cc8f94bc59e5919715bc03fc8353fa770d.zip | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/pgtable-ppc32.h
Diffstat (limited to 'drivers/power/olpc_battery.c')
0 files changed, 0 insertions, 0 deletions