diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-20 13:52:23 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-20 13:52:23 +0200 |
| commit | b9afa3e015273a52718e0a7efe198a0df76be880 (patch) | |
| tree | 88cf67276533fcd5622d4cc2165ba889a98bb0db /drivers/char/bfin-otp.c | |
| parent | Merge branch 'sh/pci-express-integration' (diff) | |
| parent | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff) | |
| download | linux-b9afa3e015273a52718e0a7efe198a0df76be880.tar.xz linux-b9afa3e015273a52718e0a7efe198a0df76be880.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/process_32.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/char/bfin-otp.c')
0 files changed, 0 insertions, 0 deletions