diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-25 04:35:48 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-25 04:35:48 +0100 |
commit | 7c12c92fba4bd985ed6d909e5537468b268dcaa4 (patch) | |
tree | 569639a44c52335eefa1029f922a5eca8c40362e /drivers/uio/uio.c | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | Merge branch 'linux-2.6' into merge (diff) | |
download | linux-7c12c92fba4bd985ed6d909e5537468b268dcaa4.tar.xz linux-7c12c92fba4bd985ed6d909e5537468b268dcaa4.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] mpc5200: Fix incorrect compatible string for the mdio node
[POWERPC] Update some defconfigs
Diffstat (limited to 'drivers/uio/uio.c')
0 files changed, 0 insertions, 0 deletions