diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-08 12:14:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-08 12:14:27 -0700 |
commit | fe5a2de17e65d82b9d502da80ccb5a689d03fdd2 (patch) | |
tree | 546492b849c1113ac6889395c353ae577860c7fd /arch/arm/mach-pxa/pm.c | |
parent | Fix permission checking for the new utimensat() system call (diff) | |
parent | qd65xx: fix PIO mode selection (diff) | |
download | linux-dev-fe5a2de17e65d82b9d502da80ccb5a689d03fdd2.tar.xz linux-dev-fe5a2de17e65d82b9d502da80ccb5a689d03fdd2.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
qd65xx: fix PIO mode selection
sis5513: adding PCI-ID
Diffstat (limited to 'arch/arm/mach-pxa/pm.c')
0 files changed, 0 insertions, 0 deletions