Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel...

A collection of warning fixes on non-ARM code from Arnd Bergmann:

* 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: s3c: mark s3c2440_clk_add as __init_refok
  spi/s3c64xx: use correct dma_transfer_direction type
  pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
  USB: EHCI: mark ehci_orion_conf_mbus_windows __devinit
  mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN
  SCSI: ARM: make fas216_dumpinfo function conditional
  SCSI: ARM: ncr5380/oak uses no interrupts

diff --cc arch/arm/mach-s3c24xx/clock-s3c2440.c
Simple merge

diff --cc drivers/spi/spi-s3c64xx.c
Simple merge

diff --cc drivers/usb/host/ehci-orion.c
Simple merge

diff --cc mm/slob.c
index a08e4681fd0d630ff212e299f5b657f71e48c4b0,497c55e318a19932e931f488b9d70df550122c88..1e921c5e9576b6db64cc07fb4f4c90a8f4e2729e
--- 1/mm/slob.c
--- 2/mm/slob.c
+++ b/mm/slob.c
@@@ -425,11 -425,10 +425,11 @@@ out
   * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
   */
  
 -void *__kmalloc_node(size_t size, gfp_t gfp, int node)
 +static __always_inline void *
 +__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
  {
        unsigned int *m;
-       int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+       int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
        void *ret;
  
        gfp &= gfp_allowed_mask;