Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming

Browse source

Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.

...

This commit is contained in:

J. Bruce Fields 2010-03-04 12:03:16 -05:00

parent 8d75da8afd 398007f863

commit 4ea41e2de5

1318 changed files with 30858 additions and 12532 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

12

Documentation/ABI/testing/ima_policy

View file

4

Documentation/cpu-freq/governors.txt

View file

4

Documentation/fault-injection/fault-injection.txt

View file

49

Documentation/feature-removal-schedule.txt

View file

48

Documentation/input/multi-touch-protocol.txt

View file

9

Documentation/kernel-parameters.txt

View file

8

Documentation/networking/ip-sysctl.txt

View file

26

Documentation/trace/ftrace-design.txt

View file

2

Documentation/trace/ftrace.txt

View file

40

MAINTAINERS

View file

5

Makefile

View file

3

arch/alpha/include/asm/topology.h

View file

71

arch/arm/Kconfig

View file

6

arch/arm/Makefile

View file

8

arch/arm/boot/compressed/head.S

View file

13

arch/arm/boot/compressed/misc.c

View file

23

arch/arm/include/asm/cacheflush.h

View file

20

arch/arm/kernel/debug.S

View file

9

arch/arm/kernel/elf.c

View file

1

arch/arm/kernel/setup.c

View file

1

arch/arm/mach-davinci/include/mach/keyscan.h

View file

4

arch/arm/mach-gemini/gpio.c

View file

4

arch/arm/mach-gemini/include/mach/uncompress.h

View file

6

arch/arm/mach-kirkwood/rd88f6192-nas-setup.c

View file

58

arch/arm/mach-mx25/clock.c

View file

2

arch/arm/mach-mx25/mx25pdk.c

View file

4

arch/arm/mach-mx3/mx31ads.c

View file

6

arch/arm/mach-omap1/clock.c

View file

4

arch/arm/mach-omap2/clock34xx_data.c

View file

62

arch/arm/mach-omap2/clock44xx_data.c

View file

2

arch/arm/mach-omap2/cpuidle34xx.c

View file

7

arch/arm/mach-omap2/gpmc.c

View file

41

arch/arm/mach-omap2/id.c

View file

22

arch/arm/mach-omap2/irq.c

View file

7

arch/arm/mach-omap2/mmc-twl4030.c

View file

37

arch/arm/mach-omap2/mux.c

View file

24

arch/arm/mach-omap2/mux.h

View file

47

arch/arm/mach-omap2/mux34xx.c

View file

3

arch/arm/mach-omap2/omap_hwmod.c

View file

12

arch/arm/mach-omap2/pm-debug.c

View file

8

arch/arm/mach-omap2/pm.h

View file

47

arch/arm/mach-omap2/pm34xx.c

View file

11

arch/arm/mach-omap2/prcm.c

View file

2

arch/arm/mach-omap2/prm.h

View file

32

arch/arm/mach-omap2/prm44xx.h

View file

11

arch/arm/mach-omap2/serial.c

View file

13

arch/arm/mach-omap2/sleep34xx.S

View file

33

arch/arm/mach-orion5x/dns323-setup.c

View file

79

arch/arm/mach-orion5x/wrt350n-v2-setup.c

View file

1

arch/arm/mach-pxa/corgi.c

View file

6

arch/arm/mach-pxa/include/mach/mfp-pxa25x.h

View file

14

arch/arm/mach-pxa/irq.c

View file

4

arch/arm/mach-realview/realview_pbx.c

View file

36

arch/arm/mach-s3c2440/mach-mini2440.c

View file

2

arch/arm/mach-s3c6410/mach-hmt.c

View file

1

arch/arm/mach-s3c6410/mach-smdk6410.c

View file

3

arch/arm/mm/alignment.c

View file

2

arch/arm/mm/mmu.c

View file

2

arch/arm/mm/proc-arm6_7.S

View file

2

arch/arm/mm/proc-v6.S

View file

11

arch/arm/mm/proc-v7.S

View file

137

arch/arm/plat-mxc/audmux-v2.c

View file

2

arch/arm/plat-mxc/include/mach/board-mx31lite.h

View file

2

arch/arm/plat-mxc/include/mach/common.h

View file

2

arch/arm/plat-mxc/include/mach/iomux-mx35.h

View file

5

arch/arm/plat-mxc/include/mach/irqs.h

View file

4

arch/arm/plat-mxc/include/mach/uncompress.h

View file

4

arch/arm/plat-omap/clock.c

View file

26

arch/arm/plat-omap/common.c

View file

2

arch/arm/plat-omap/dma.c

View file

13

arch/arm/plat-omap/dmtimer.c

View file

4

arch/arm/plat-omap/gpio.c

View file

1

arch/arm/plat-omap/include/plat/cpu.h

View file

3

arch/arm/plat-omap/include/plat/irqs.h

View file

1

arch/arm/plat-omap/include/plat/omap_hwmod.h

View file

10

arch/arm/plat-omap/omap_device.c

View file

6

arch/arm/plat-orion/pcie.c

View file

4

arch/arm/plat-s3c/dev-nand.c

View file

104

arch/arm/tools/mach-types

View file

5

arch/arm/vfp/vfpmodule.c

View file

15

arch/avr32/mach-at32ap/at32ap700x.c

View file

1

arch/ia64/include/asm/acpi.h

View file

4

arch/ia64/include/asm/elf.h

View file

2

arch/ia64/sn/kernel/setup.c

View file

1

arch/m68knommu/platform/coldfire/pit.c

View file

2

arch/microblaze/Kconfig

View file

112

arch/microblaze/configs/mmu_defconfig

View file

101

arch/microblaze/configs/nommu_defconfig

View file

2

arch/microblaze/include/asm/io.h

View file

14

arch/microblaze/include/asm/ptrace.h

View file

5

arch/microblaze/include/asm/unistd.h

View file

27

arch/microblaze/kernel/cpu/cache.c

View file

10

arch/microblaze/kernel/entry-nommu.S

View file

2

arch/microblaze/kernel/prom_parse.c

View file

1

arch/microblaze/kernel/setup.c

View file

2

arch/microblaze/kernel/syscall_table.S

View file

1

arch/mips/Kconfig

View file

7

arch/mips/alchemy/common/dbdma.c

View file

2

arch/mips/ar7/platform.c

View file

8

arch/mips/bcm47xx/prom.c

View file

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