diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-12 19:37:29 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-12 19:37:29 -0700 |
commit | 61d6cc54896811086b51fa78d440311974a09b3a (patch) | |
tree | d02625ab046151ff915d30248093c6cf44c64066 /include/asm-parisc/floppy.h | |
parent | c6d8f400cc7610f04177f81168c19b8407cb48c3 (diff) | |
parent | 3692fd0aaef489b063518b5999c702bada5b6e22 (diff) | |
download | op-kernel-dev-61d6cc54896811086b51fa78d440311974a09b3a.zip op-kernel-dev-61d6cc54896811086b51fa78d440311974a09b3a.tar.gz |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5091/1: Add missing bitfield include to regs-lcd.h
[ARM] 5090/1: Correct pxafb palette typo error
[ARM] 5077/1: spi: fix list scan success verification in PXA ssp driver
Diffstat (limited to 'include/asm-parisc/floppy.h')
0 files changed, 0 insertions, 0 deletions