Skip to content
Commit 0a1340c1 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

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

Conflicts:

	include/linux/kernel.h
parents af18ddb8 29454dde
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment