Skip to content
Commit b981d8b3 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

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

Conflicts:

	drivers/macintosh/adbhid.c
parents b11d2127 2b9e0aae
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment