| commit | 85af434a5b5040b4b86001bd73561417b1c3e9d8 | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Tue, 9 Aug 2011 09:47:50 +0000 (9 11:47 +0200) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Tue, 9 Aug 2011 09:47:50 +0000 (9 11:47 +0200) | ||
| tree | 2d2df76cd7cf841221814dfbd8ab54ac6a1f167c | treesnapshot (tar.gz zip) |
| parent | 55f5b03140f4a449c0a7d665ae586f87ab8b6d9d | commitdiff |
| parent | 2f84dd70916ccadd25e94d28363182a978f569b6 | commitdiff |
Merge branch 'linus'
Conflicts:
drivers/char/random.c
Conflicts:
drivers/char/random.c
| drivers/acpi/battery.c | diff1 | diff2 | blobhistory |
| drivers/char/random.c | diff1 | diff2 | blobhistory |
| drivers/platform/x86/Kconfig | diff1 | diff2 | blobhistory |
| include/linux/random.h | diff1 | diff2 | blobhistory |