www.infradead.org Git - users/willy/xarray.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Tue, 14 Apr 2009 17:10:16 +0000 (10:10 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Tue, 14 Apr 2009 17:10:16 +0000 (10:10 -0700)

* 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Add missing FILE tag to MAINTAINERS
  microblaze: remove duplicated #include's
  microblaze: struct device - replace bus_id with dev_name()
  microblaze: Simplify copy_thread()
  microblaze: Add TIMESTAMPING constants to socket.h
  microblaze: Add missing empty ftrace.h file
  microblaze: Fix problem with removing zero length files

		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge