diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-10-29 09:12:37 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-10-29 09:12:37 +0100 |
| commit | 7b724e6c828448ea82ba809204a53307cc235b0f (patch) | |
| tree | 386f9e56ae6d4ab89f93334730ac199bf0ded029 /net/unix/af_unix.c | |
| parent | 346bf8916fbefb63e704a98198dd4ddd4d0ae090 (diff) | |
| parent | e2984cbfddd5c8fac88b24d7e5f28e1cfb6f3838 (diff) | |
| download | lwn-7b724e6c828448ea82ba809204a53307cc235b0f.tar.gz lwn-7b724e6c828448ea82ba809204a53307cc235b0f.zip | |
v2.6.31.5-rt16
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.31.y
into rt/2.6.31
Conflicts:
Makefile
kernel/futex.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions