tree fa7f8400ac685fb52e96f64997c7c682fc2aa021
parent 7b39f90fabcf9e2af0cd79d0a60440d821e22b56
parent 537b60d17894b7c19a6060feae40299d7109d6e7
author David S. Miller <davem@davemloft.net> 1274248915 -0700
committer David S. Miller <davem@davemloft.net> 1274248915 -0700

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

Conflicts:
	include/linux/mod_devicetable.h
	scripts/mod/file2alias.c