diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:25:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:25:42 -0700 |
| commit | 2d3b07c07b39c4b7d9b6641052a02d996cd5d87c (patch) | |
| tree | 38f0e2865cc6c1eac3311cdf7539853afd222f4b /drivers/watchdog | |
| parent | 150cd843fac0160fce616fb3e5cbe64e9db7481e (diff) | |
| parent | 8654b1c2de1465120974899fc1c8aa00e91d4b7e (diff) | |
| download | op-kernel-dev-2d3b07c07b39c4b7d9b6641052a02d996cd5d87c.zip op-kernel-dev-2d3b07c07b39c4b7d9b6641052a02d996cd5d87c.tar.gz | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Move olpc to platform
x86: Move uv to platform
x86: Move mrst to platform
x86: Move scx200 to platform
x86: Move visws to platform
x86: Move efi to platform
x86: Move sfi to platform
x86: Add platform directory
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions
