Skip to content
Commit 2ec8c6bb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 

Conflicts:
	include/linux/mod_devicetable.h
	scripts/mod/file2alias.c
parents 7b39f90f 537b60d1
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