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: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b981d8b3f5e008ff10d993be633ad00564fc22cd;p=linux-2.6-omap-h63xx.git

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

Conflicts:

	drivers/macintosh/adbhid.c
---

b981d8b3f5e008ff10d993be633ad00564fc22cd
diff --cc drivers/macintosh/adbhid.c
index 9ff2189d2e2,48d17bf6c92..8cce016b3d0
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@@ -334,7 -296,7 +334,7 @@@ adbhid_input_keycode(int id, int scanco
  			keycode = ADB_KEY_POWER;
  		}
  		break;
--	case ADB_KEY_POWER: 
++	case ADB_KEY_POWER:
  		/* Fn + Command will produce a bogus "power" keycode */
  		if (ahid->flags & FLAG_FN_KEY_PRESSED) {
  			keycode = ADB_KEY_CMD;