diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-07-04 11:00:38 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-04 11:00:42 +0200 |
| commit | d7e57676e3ed7ab9b2c7c4bcb7873e51eacbdb84 (patch) | |
| tree | f7433f38cd407a0c35a8cbf2b7e3fd756087bce7 /lib/fault-inject.c | |
| parent | x86: ds.c fix invalid assignment (diff) | |
| parent | Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify (diff) | |
| download | wireguard-linux-d7e57676e3ed7ab9b2c7c4bcb7873e51eacbdb84.tar.xz wireguard-linux-d7e57676e3ed7ab9b2c7c4bcb7873e51eacbdb84.zip | |
Merge branch 'linus' into x86/cleanups
Merge reason: We were on an older pre-rc1 base, move to almost-rc2.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/fault-inject.c')
0 files changed, 0 insertions, 0 deletions