Francesco Virlinzi
3256251f98
stmmac: use custom init/exit functions in pm ops ...
Freeze and restore can call the custom init/exit functions.
Also the patch adds a custom data field that can be used
for storing platform data useful on restore the embedded
setup (e.g. GPIO, SYSCFG).
Signed-off-by: Francesco Virlinzi <francesco.virlinzi@st.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-19 20:08:44 -04:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
asm-generic: add linux/types.h to cmpxchg.h
2012-04-02 14:41:27 -07:00
crypto: user - Fix lookup of algorithms with IV generator
2012-03-29 19:52:47 +08:00
Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes
2012-04-12 17:42:01 +01:00
stmmac: use custom init/exit functions in pm ops
2012-04-19 20:08:44 -04:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2012-04-18 14:27:48 -04:00
SCSI updates on 20120331
2012-03-31 13:31:23 -07:00
ALSA: hda - hide HDMI/ELD printks unless snd.debug=2
2012-04-10 14:53:55 +02:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-04-04 10:04:42 -07:00
Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
2012-03-27 18:17:02 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-04-04 17:13:43 -07:00
3256251f98