diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-10-10 20:34:32 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-10-10 20:34:32 -0700 |
| commit | 157097089f21d1c99b03b1d09fac82ccc4b1a636 (patch) | |
| tree | 8dae9354c66392d655f7d0349a922f643535948e /block/blk-cgroup.h | |
| parent | 67204e11aedd25df0eb238f02f1cfc65ed197328 (diff) | |
| parent | 5d9d49c51678f5e4c37ce661b4573d73fb391040 (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-fport
Conflicts:
drivers/usb/host/ehci-q.c
drivers/usb/host/ehci.h
Diffstat (limited to 'block/blk-cgroup.h')
0 files changed, 0 insertions, 0 deletions