From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 21 Jul 2008 04:55:14 +0000 (-0400)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~31644^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=908cf4b925e419bc74f3297b2f0e51d6f8a81da2;p=mirror_ubuntu-artful-kernel.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
---

908cf4b925e419bc74f3297b2f0e51d6f8a81da2