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

Browse source

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: pci_controller->arch_data really is a struct device_node *
  microblaze: Add missing double apostrophe in Kconfig
  microblaze: Add PT_ macros for special purpose regs
  microblaze: Enable accept4 syscall
  microblaze: Wire up recvmmsg syscall

...

This commit is contained in:

Linus Torvalds 2010-01-18 14:12:42 -08:00

parent fe64454d7b 878194c823

commit 91302873ba

5 changed files with 20 additions and 5 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

2

arch/microblaze/Kconfig

View file

14

arch/microblaze/include/asm/ptrace.h

View file

5

arch/microblaze/include/asm/unistd.h

View file

2

arch/microblaze/kernel/prom_parse.c

View file

2

arch/microblaze/kernel/syscall_table.S

View file