| commit | 91302873bad9550ad06f09dd1ce9e283900ef84e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 18 14:12:42 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 18 14:12:42 2010 -0800 |
| tree | 387e2764ca5966c08eb13a5e12cf8a1745769db7 | |
| parent | fe64454d7b0474cc43360d86267844b043275e82 [diff] | |
| parent | 878194c8237e4fc5276685ec59cb3bfb9341988c [diff] |
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze * '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