]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cgroup/for-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:32:33 +0000 (11:32 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:32:33 +0000 (11:32 +0200)
commitd4357337ce8991c910c349ad6703c1631c137c50
tree3c20cb9cec748358570fb1c9157210815bb6b6fc
parentaad98f906f36841b3633517b2e930b0f9b735656
parent0d60e6cd793e68ef3163514288a599d3d5b5dd50
Merge remote-tracking branch 'cgroup/for-next'

Conflicts:
mm/memcontrol.c
mm/memcontrol.c