From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Apr 2009 17:10:16 +0000 (-0700)
Subject: Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze
X-Git-Tag: firefly_0821_release~14461
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2b6b6d385d2933c105e27f2d25fdb36d392d7f59;p=firefly-linux-kernel-4.4.55.git

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

2b6b6d385d2933c105e27f2d25fdb36d392d7f59