| commit | 03a1de4b1b6f3db5b1b2ef5aa208a1477a75af84 | |
| author | Mircea Gherzan <mgherzan@gmail.com> | |
| Mon, 7 Feb 2011 11:22:40 +0000 (7 12:22 +0100) | ||
| committer | Mircea Gherzan <mgherzan@gmail.com> | |
| Mon, 7 Feb 2011 11:22:40 +0000 (7 12:22 +0100) | ||
| tree | 23ac081e08a5482964950a1fb01714ed696dc78a | treesnapshot (tar.gz zip) |
| parent | 477377d0cafa35d25318601493082c8acb1d96e4 | commitdiff |
| parent | e71084af58cf15e6043338500eeaf6281d0a62af | commitdiff |
Merge branch 'master' of git://git./linux/kernel/git/ieee1394/linux1394-2.6
Conflicts:
drivers/firewire/Kconfig
drivers/firewire/Makefile
Conflicts:
drivers/firewire/Kconfig
drivers/firewire/Makefile
| drivers/firewire/Kconfig | blob1 | blob2 | history |
| drivers/firewire/Makefile | blob1 | blob2 | history |