Merge branches 'core/futexes' and 'core/iommu' into core/urgent

Browse source

Merge reason: Switch from topical split to the stabilization track

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2010-03-04 11:45:25 +01:00

parent 90a6501f94 f409adf5b1 c13f3d378f

commit 0e064caf64

2 changed files with 3 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/x86/kernel/aperture_64.c

View file

6

kernel/futex_compat.c

View file