summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-14 20:02:21 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-14 20:02:21 +0100
commit326d8519fc97be186c55ac605c3a7c957c758ae1 (patch)
treec2a25f2ce5ea7095715a62bad984ecd95fb0b717 /drivers/platform
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff)
parentMIPS: Mark Eins: Fix configuration. (diff)
downloadlinux-326d8519fc97be186c55ac605c3a7c957c758ae1.tar.xz
linux-326d8519fc97be186c55ac605c3a7c957c758ae1.zip
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: Mark Eins: Fix configuration. MIPS: Fix TIF_32BIT undefined problem when seccomp is disabled
Diffstat (limited to 'drivers/platform')
0 files changed, 0 insertions, 0 deletions