Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Browse source

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k,m68knommu: merge header files

Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild

...

This commit is contained in:

Linus Torvalds 2009-01-26 10:33:01 -08:00

parent 9f4863b7dc 49148020bc

commit ac3d266bf1

610 changed files with 31197 additions and 31032 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/m68knommu/include/asm/Kbuild → arch/m68k/include/asm/Kbuild

View file

0

arch/m68knommu/include/asm/MC68328.h → arch/m68k/include/asm/MC68328.h

View file

0

arch/m68knommu/include/asm/MC68332.h → arch/m68k/include/asm/MC68332.h

View file

0

arch/m68knommu/include/asm/MC68EZ328.h → arch/m68k/include/asm/MC68EZ328.h

View file

0

arch/m68knommu/include/asm/MC68VZ328.h → arch/m68k/include/asm/MC68VZ328.h

View file

67

arch/m68k/include/asm/a.out-core.h

View file

20

arch/m68k/include/asm/a.out.h

View file

44

arch/m68k/include/asm/adb_iop.h

View file

350

arch/m68k/include/asm/amigahw.h

View file

113

arch/m68k/include/asm/amigaints.h

View file

107

arch/m68k/include/asm/amigayle.h

View file

110

arch/m68k/include/asm/amipcmcia.h

View file

0

arch/m68knommu/include/asm/anchor.h → arch/m68k/include/asm/anchor.h

View file

248

arch/m68k/include/asm/apollodma.h

View file

108

arch/m68k/include/asm/apollohw.h

View file

12

arch/m68k/include/asm/atafd.h

View file

79

arch/m68k/include/asm/atafdreg.h

View file

22

arch/m68k/include/asm/atari_joystick.h

View file

22

arch/m68k/include/asm/atari_stdma.h

View file

17

arch/m68k/include/asm/atari_stram.h

View file

807

arch/m68k/include/asm/atarihw.h

View file

204

arch/m68k/include/asm/atariints.h

View file

46

arch/m68k/include/asm/atarikb.h

View file

5

arch/m68k/include/asm/atomic.h

View file

196

arch/m68k/include/asm/atomic_mm.h

View file

0

arch/m68knommu/include/asm/atomic.h → arch/m68k/include/asm/atomic_no.h

View file

0

arch/m68knommu/include/asm/auxvec.h → arch/m68k/include/asm/auxvec.h

View file

5

arch/m68k/include/asm/bitops.h

View file

464

arch/m68k/include/asm/bitops_mm.h

View file

0

arch/m68knommu/include/asm/bitops.h → arch/m68k/include/asm/bitops_no.h

View file

32

arch/m68k/include/asm/blinken.h

View file

5

arch/m68k/include/asm/bootinfo.h

View file

378

arch/m68k/include/asm/bootinfo_mm.h

View file

0

arch/m68knommu/include/asm/bootinfo.h → arch/m68k/include/asm/bootinfo_no.h

View file

0

arch/m68knommu/include/asm/bootstd.h → arch/m68k/include/asm/bootstd.h

View file

5

arch/m68k/include/asm/bug.h

View file

29

arch/m68k/include/asm/bug_mm.h

View file

0

arch/m68knommu/include/asm/bug.h → arch/m68k/include/asm/bug_no.h

View file

5

arch/m68k/include/asm/bugs.h

View file

14

arch/m68k/include/asm/bugs_mm.h

View file

0

arch/m68knommu/include/asm/bugs.h → arch/m68k/include/asm/bugs_no.h

View file

150

arch/m68k/include/asm/bvme6000hw.h

View file

5

arch/m68k/include/asm/byteorder.h

View file

6

arch/m68k/include/asm/byteorder_mm.h

View file

0

arch/m68knommu/include/asm/byteorder.h → arch/m68k/include/asm/byteorder_no.h

View file

5

arch/m68k/include/asm/cache.h

View file

11

arch/m68k/include/asm/cache_mm.h

View file

0

arch/m68knommu/include/asm/cache.h → arch/m68k/include/asm/cache_no.h

View file

14

arch/m68k/include/asm/cachectl.h

View file

5

arch/m68k/include/asm/cacheflush.h

View file

156

arch/m68k/include/asm/cacheflush_mm.h

View file

0

arch/m68knommu/include/asm/cacheflush.h → arch/m68k/include/asm/cacheflush_no.h

View file

5

arch/m68k/include/asm/checksum.h

View file

148

arch/m68k/include/asm/checksum_mm.h

View file

0

arch/m68knommu/include/asm/checksum.h → arch/m68k/include/asm/checksum_no.h

View file

0

arch/m68knommu/include/asm/coldfire.h → arch/m68k/include/asm/coldfire.h

View file

0

arch/m68knommu/include/asm/commproc.h → arch/m68k/include/asm/commproc.h

View file

53

arch/m68k/include/asm/contregs.h

View file

6

arch/m68k/include/asm/cputime.h

View file

5

arch/m68k/include/asm/current.h

View file

6

arch/m68k/include/asm/current_mm.h

View file

0

arch/m68knommu/include/asm/current.h → arch/m68k/include/asm/current_no.h

View file

0

arch/m68knommu/include/asm/dbg.h → arch/m68k/include/asm/dbg.h

View file

5

arch/m68k/include/asm/delay.h

View file

57

arch/m68k/include/asm/delay_mm.h

View file

0

arch/m68knommu/include/asm/delay.h → arch/m68k/include/asm/delay_no.h

View file

0

arch/m68knommu/include/asm/device.h → arch/m68k/include/asm/device.h

View file

5

arch/m68k/include/asm/div64.h

View file

28

arch/m68k/include/asm/div64_mm.h

View file

0

arch/m68knommu/include/asm/div64.h → arch/m68k/include/asm/div64_no.h

View file

5

arch/m68k/include/asm/dma-mapping.h

View file

112

arch/m68k/include/asm/dma-mapping_mm.h

View file

0

arch/m68knommu/include/asm/dma-mapping.h → arch/m68k/include/asm/dma-mapping_no.h

View file

5

arch/m68k/include/asm/dma.h

View file

16

arch/m68k/include/asm/dma_mm.h

View file

0

arch/m68knommu/include/asm/dma.h → arch/m68k/include/asm/dma_no.h

View file

35

arch/m68k/include/asm/dsp56k.h

View file

240

arch/m68k/include/asm/dvma.h

View file

5

arch/m68k/include/asm/elf.h

View file

119

arch/m68k/include/asm/elf_mm.h

View file

0

arch/m68knommu/include/asm/elf.h → arch/m68k/include/asm/elf_no.h

View file

0

arch/m68knommu/include/asm/elia.h → arch/m68k/include/asm/elia.h

View file

0

arch/m68knommu/include/asm/emergency-restart.h → arch/m68k/include/asm/emergency-restart.h

View file

5

arch/m68k/include/asm/entry.h

View file

137

arch/m68k/include/asm/entry_mm.h

View file

0

arch/m68knommu/include/asm/entry.h → arch/m68k/include/asm/entry_no.h

View file

6

arch/m68k/include/asm/errno.h

View file

5

arch/m68k/include/asm/fb.h

View file

34

arch/m68k/include/asm/fb_mm.h

View file

0

arch/m68knommu/include/asm/fb.h → arch/m68k/include/asm/fb_no.h

View file

330

arch/m68k/include/asm/fbio.h

View file

11

arch/m68k/include/asm/fcntl.h

View file

0

arch/m68knommu/include/asm/flat.h → arch/m68k/include/asm/flat.h

View file

254

arch/m68k/include/asm/floppy.h

View file

5

arch/m68k/include/asm/fpu.h

View file

21

arch/m68k/include/asm/fpu_mm.h

View file

0

arch/m68knommu/include/asm/fpu.h → arch/m68k/include/asm/fpu_no.h

View file

0

arch/m68knommu/include/asm/futex.h → arch/m68k/include/asm/futex.h

View file

5

arch/m68k/include/asm/hardirq.h

View file

16

arch/m68k/include/asm/hardirq_mm.h

View file

Some files were not shown because too many files have changed in this diff Show more