diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-03 08:26:33 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-03 08:26:33 +0200 |
| commit | c50e86ce7c2961a41f2f7aa6e4fd6c99229ba205 (patch) | |
| tree | 4ea36009719bd8fc523239fe1bdccb90f0dce3ae /arch/s390/include/asm/shmparam.h | |
| parent | OMAPDSS: Correct DISPC_IRQ bit definitions for LCD3 (diff) | |
| parent | Linux 3.6-rc4 (diff) | |
| download | linux-c50e86ce7c2961a41f2f7aa6e4fd6c99229ba205.tar.xz linux-c50e86ce7c2961a41f2f7aa6e4fd6c99229ba205.zip | |
Merge tag 'v3.6-rc4'
Merge 3.6-rc4 to get latest OMAP and device tree fixes.
Diffstat (limited to 'arch/s390/include/asm/shmparam.h')
| -rw-r--r-- | arch/s390/include/asm/shmparam.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/include/asm/shmparam.h b/arch/s390/include/asm/shmparam.h index c2e0c0508e73..e985182738f8 100644 --- a/arch/s390/include/asm/shmparam.h +++ b/arch/s390/include/asm/shmparam.h @@ -1,6 +1,4 @@ /* - * include/asm-s390/shmparam.h - * * S390 version * * Derived from "include/asm-i386/shmparam.h" |