diff options
author | Tejun Heo <tj@kernel.org> | 2011-05-02 14:08:43 +0200 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-05-02 14:08:47 +0200 |
commit | aff364860aa105b2deacc6f21ec8ef524460e3fc (patch) | |
tree | 18409ebe16b25b141598da9b6386d69416c06afa /drivers/usb/host/ohci-hcd.c | |
parent | ioremap: Delay sanity check until after a successful mapping (diff) | |
parent | x86-32, numa: Update remap allocator comments (diff) | |
download | linux-aff364860aa105b2deacc6f21ec8ef524460e3fc.tar.xz linux-aff364860aa105b2deacc6f21ec8ef524460e3fc.zip |
Merge branch 'x86/numa' into x86-mm
Merge reason: Pick up x86-32 remap allocator cleanup changes - 14
commits, 3fe14ab541^..993ba1585c.
3fe14ab541: x86-32, numa: Fix failure condition check in alloc_remap()
993ba1585c: x86-32, numa: Update remap allocator comments
Scheduled NUMA init 32/64bit unification changes depend on them.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/usb/host/ohci-hcd.c')
0 files changed, 0 insertions, 0 deletions