| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd | [log] [tgz] |
|---|---|---|
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Fri Oct 12 21:27:47 2007 -0400 |
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Fri Oct 12 21:27:47 2007 -0400 |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca [diff] | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: drivers/macintosh/adbhid.c