From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Sat, 13 Oct 2007 01:27:47 +0000 (-0400)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.24-rc1~1279^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b981d8b3f5e008ff10d993be633ad00564fc22cd;p=pandora-kernel.git

Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/macintosh/adbhid.c
---

b981d8b3f5e008ff10d993be633ad00564fc22cd
Reading git-diff-tree failed