Linus Torvalds 50e0d10232 This has three changes for asm-generic that did not really fit into any ... other branch as normal asm-generic changes do. One is a fix for a build warning, the other two are more interesting: * A patch from Mark Brown to allow using the common clock infrastructure on all architectures, so we can use the clock API in architecture independent device drivers. * The UAPI split patches from David Howells for the asm-generic files. There are other architecture specific series that are going through the arch maintainer tree and that depend on this one. There may be a few small merge conflicts between Mark's patch and the following arch header file split patches. In each case the solution will be to keep the new "generic-y += clkdev.h" line, even if it ends up being the only line in the Kbuild file. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIVAwUAUHLuO2CrR//JCVInAQLsKxAAoa+oSP3KGuQbLHq2wvUxAdXWDFcZgKo+ qMRejSJPI0sreJ9GJHpUjHtJ7W2gujeo9upmUIJzoWY9vrmjkhCDkaWliaQI8SmY CKB9zI2xCB9iFzHtWxocfnJzU7NvzjJm+jnIYrqkaO9HGMxL99tsv9TsBYXK/08j QmlGP5fHdGU3zZxVt5r1GL8/nfX4zn3/YEll9nJ7vqXZltIBbaksxmgPoa0QkkH8 LMeMAlgRR2DHWt58gXHyGB7Afx3QEnZBDaQpYxA446P+2gtvIhFYOnpuX14pZb7t m4IM0vOO6WzARQR6DJlRHfYJevojgGHu4Y8wkEzuWE+Hr2BqmiVct7UKqGJdqTY5 7+I7wwaJmdd3zE61LxRS9UOjJDwMh1gmsNU4+42RArQ5eLcikNR5zfYzDRLCTmnk qKZvbiaxgme2YvWazxbBT6EqmIVU6lfHHIoMLr8U0j40Cl0GCmN7EBbe7/r2Jhjs 6VnCOJ6vb4RCOJGGAcLRMQu7xEtqcCe0Zht839wl13QXewxS3QRgwg6Bjy/fwA9r jij5gf+R25J/fQW7yZv4LwcMowRE1xvpu0ebwkK3LLR8jcon71scd6f3PW/bUUpj j4tgFuJbXzOxQ4LFgBzvdVgx3wDzsQhqb/6p2l6ROdcw7xXFDdFZ4zq3h0A25wXZ J6WDO387tpg= =Aaki -----END PGP SIGNATURE----- Merge tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic Pull asm-generic updates from Arnd Bergmann: "This has three changes for asm-generic that did not really fit into any other branch as normal asm-generic changes do. One is a fix for a build warning, the other two are more interesting: * A patch from Mark Brown to allow using the common clock infrastructure on all architectures, so we can use the clock API in architecture independent device drivers. * The UAPI split patches from David Howells for the asm-generic files. There are other architecture specific series that are going through the arch maintainer tree and that depend on this one. There may be a few small merge conflicts between Mark's patch and the following arch header file split patches. In each case the solution will be to keep the new "generic-y += clkdev.h" line, even if it ends up being the only line in the Kbuild file." * tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: UAPI: (Scripted) Disintegrate include/asm-generic asm-generic: Add default clkdev.h asm-generic: xor: mark static functions as __maybe_unused		2012-10-09 15:58:38 +09:00
..
alpha	Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic	2012-10-04 22:57:51 +02:00
arm	Sound updates for 3.7-rc1	2012-10-09 07:07:14 +09:00
arm64	arm64: Enable interrupts before calling do_notify_resume()	2012-10-08 18:04:21 +01:00
avr32	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
blackfin	Sound updates for 3.7-rc1	2012-10-09 07:07:14 +09:00
c6x	Merge branch 'uapi-prep' of git://git.infradead.org/users/dhowells/linux-headers	2012-10-07 07:55:10 +09:00
cris	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
frv	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
h8300	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
hexagon	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
ia64	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
m32r	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
m68k	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
microblaze	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
mips	Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2012-10-08 07:56:10 +09:00
mn10300	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
openrisc	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
parisc	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
powerpc	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
s390	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
score	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
sh	cross-arch: don't corrupt personality flags upon exec()	2012-10-06 03:04:47 +09:00
sparc	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
tile	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
um	Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic	2012-10-04 22:57:51 +02:00
unicore32	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
x86	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
xtensa	This has three changes for asm-generic that did not really fit into any	2012-10-09 15:58:38 +09:00
.gitignore
Kconfig	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-10-01 10:43:39 -07:00