| commit | e6e5fee1426bef07f4e6c3c76f48343c14207938 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Sep 22 12:56:22 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Sep 22 12:56:22 2006 -0700 |
| tree | 28f4ca26cf85e0971e9bb4927c439b36c2b93f51 | |
| parent | 3e59ddff2b8dfe42b15520c4f8f2486bd9f9708e [diff] | |
| parent | fadcfa33b6319a5faf8af2287f08bf93a7f926b6 [diff] |
Merge git://git.infradead.org/~dwmw2/hdroneline * git://git.infradead.org/~dwmw2/hdroneline: [HEADERS] One line per header in Kbuild files to reduce conflicts Manual (trivial) conflict resolution in include/asm-s390/Kbuild