Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | uml got broken by commit 30742d5c2277c325fb0e9d2d817d55a19995fe8f | Al Viro | 2009-01-05 |
| | | | | | | | | | ... if you revert a commit, revert the fixups elsewhere that had been triggered by it. Such as 8c56250f48347750c82ab18d98d647dcf99ca674 (lockdep, UML: fix compilation when CONFIG_TRACE_IRQFLAGS_SUPPORT is not set). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | ||
* | Merge commit 'v2.6.28-rc2' into core/locking | Ingo Molnar | 2008-10-28 |
| | | | | | Conflicts: arch/um/include/asm/system.h | ||
* | x86, um: get rid of system.h -> system.h include | Al Viro | 2008-10-23 |
Long-term we want to split system.h and include barriers part from underlying target; for now copy that part to sysdep. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com> |