Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b6b6d38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3e862dd5 0a8c7914

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3680,6 +3680,7 @@ L: microblaze-uclinux@itee.uq.edu.au 
W:	http://www.monstr.eu/fdt/

T:	git git://git.monstr.eu/linux-2.6-microblaze.git

S:	Supported

F:	arch/microblaze/



MICROTEK X6 SCANNER

P:	Oliver Neukum

arch/microblaze/include/asm/auxvec.h

+1 −0
Original line number Diff line number Diff line

arch/microblaze/include/asm/cputable.h

+1 −0
Original line number Diff line number Diff line

arch/microblaze/include/asm/ftrace.h

0 → 100644
+1 −0
Original line number Diff line number Diff line

arch/microblaze/include/asm/hw_irq.h

+1 −0
Original line number Diff line number Diff line