]> git.karo-electronics.de Git - karo-tx-linux.git/commit - drivers/media/usb/gspca/gspca.c
Merge remote-tracking branch 'cgroup/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:36:22 +0000 (14:36 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:36:22 +0000 (14:36 +0200)
commit3c0ed6ce77185ae8d811e1a32fea1f4d137062e8
tree6ed8d97cac12e7fa347860574a48d4acc7644de2
parent9b3ca05a5aae90cbe08d212bc5c0484de3cdcb25
parent8a20749414a1673b63db4872d26e1722ba6607e2
Merge remote-tracking branch 'cgroup/for-next'

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