Merge tag 'v2.6.20-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds... linux-2.6.20-rc2
| commit | e60ea7112c6a9434e92421942a6956774218379b | |
| author | Ralf Baechle <ralf@linux-mips.org> | |
| Sun, 24 Dec 2006 18:27:03 +0000 (24 19:27 +0100) | ||
| committer | Ralf Baechle <ralf@linux-mips.org> | |
| Sun, 24 Dec 2006 18:27:03 +0000 (24 19:27 +0100) | ||
| tree | fe419b6e2775052219ff478b7d1fce37ba5e21cf | treesnapshot (tar.gz zip) |
| parent | 14af1fbfcec461e13e76ed7444a107fd20b000da | commitdiff |
| parent | 3bf8ba38f38d3647368e4edcf7d019f9f8d9184a | commitdiff |
Merge tag 'v2.6.20-rc2' of git://git./linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/host/ohci-pnx8550.c
Conflicts:
drivers/usb/host/ohci-pnx8550.c
| Makefile | diff1 | diff2 | blobhistory |
| include/linux/pci_ids.h | diff1 | diff2 | blobhistory |