diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-05-18 01:04:36 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-05-18 01:04:36 +0200 |
| commit | e23313fc76e2724fe56354526275458a0bdc10c3 (patch) | |
| tree | 49129c2092670f43a31c1f7ecc16d37ca9bc3ad4 /include/rdma/ib_user_sa.h | |
| parent | cd3258c9d166f8c64a85b0cd2c0cd64342d69eb8 (diff) | |
| parent | 34e2f560d56dfdc069a8d4dab319e078806169b9 (diff) | |
Merge branch 'platform_battery-2.6.34' into om-gta02-2.6.34
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
Diffstat (limited to 'include/rdma/ib_user_sa.h')
0 files changed, 0 insertions, 0 deletions