tree 427187b324a627098e0da53f28a3dee8bda93988
parent 3e862dd5c94cc53ba6494804c7388303e3d25403
parent 0a8c791437db4937bd160570f594d0286d3dd78d
author Linus Torvalds <torvalds@linux-foundation.org> 1239729016 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239729016 -0700

Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze

* '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